Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jul 3, 2020

I chose 18.04 because we use it for other builders, and it's enough to get a version of MinGW that can build libssh2-sys.

This is a prereq for #73902, where libssh2-sys shows up as an indirect dependency of x.py check src/tools/semverver (through src/tools/cargo, which we don't currently x.py check because it's not in-tree). See also #73902 (comment).

r? @Mark-Simulacrum cc @mati865

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

Since this isn't a dist image I believe the version doesn't matter. It might be a good idea to bump to latest LTS (20.04) but since we don't do that in other builders yet I'm fine holding off.

@bors
Copy link
Collaborator

bors commented Jul 3, 2020

📌 Commit 3bb6dc7 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 3, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2020
…arth

Rollup of 12 pull requests

Successful merges:

 - rust-lang#73140 (Fallback to xml.etree.ElementTree)
 - rust-lang#73670 (Add `format_args_capture` feature)
 - rust-lang#73693 (Use exhaustive match in const_prop.rs)
 - rust-lang#73845 (Use &raw in A|Rc::as_ptr)
 - rust-lang#73861 (Create E0768)
 - rust-lang#73881 (Standardize bibliographic citations in rustc API docs)
 - rust-lang#73925 (Improve comments from rust-lang#72617, as suggested by RalfJung)
 - rust-lang#73949 ([mir-opt] Fix mis-optimization and other issues with the SimplifyArmIdentity pass)
 - rust-lang#73984 (Edit docs for rustc_data_structures::graph::scc)
 - rust-lang#73985 (Fix "getting started" link)
 - rust-lang#73997 (fix typo)
 - rust-lang#73999 (Bump mingw-check CI image from Ubuntu 16.04 to 18.04.)

Failed merges:

 - rust-lang#74000 (add `lazy_normalization_consts` feature gate)

r? @ghost
@bors
Copy link
Collaborator

bors commented Jul 4, 2020

☔ The latest upstream changes (presumably #73650) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 4, 2020
@bors bors merged commit d69a846 into rust-lang:master Jul 4, 2020
@eddyb eddyb deleted the svv-prereq branch July 4, 2020 19:08
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants